FS#1884: respect $conf['showuseras'] in feeds

dokuwiki · Jun 26, 2010 · 681a59b · 681a59b
1 parent 69266de
commit 681a59b
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/feed.php b/feed.php
@@ -253,7 +253,18 @@ function rss_buildItems(&$rss,&$data,$opt){
             $item->author = '';
             if($user && $conf['useacl'] && $auth){
                 $userInfo = $auth->getUserData($user);
-                $item->author = $userInfo['name'];
+                if ($userInfo){
+                    switch ($conf['showuseras']){
+                        case 'username':
+                            $item->author = $userInfo['name'];
+                            break;
+                        default:
+                            $item->author = $user;
+                            break;
+                    }
+                } else {
+                    $item->author = $user;
+                }
                 if($userInfo && !$opt['guardmail']){
                     $item->authorEmail = $userInfo['mail'];
                 }else{